Sync dev with upstream (2026-07-25)#4
Merged
Merged
Conversation
…ldingCommunity#2392) Co-authored-by: Wires77 <Wires77@users.noreply.github.com>
--- New to Path of Building --- * Add support for Darkness Enthroned and Atziri's Splendour augment mods (LocalIdentity) --- Fixed Crashes --- * Fix crash on Lich Jewel breakdown hover (Blitz54) * Fix buy similar popup not updating url and persist selections (vaisest) --- User Interface --- * Only show scalable mods in Corruption roll range UI (vaisest) --- Fixed Calculations --- * Fix Conductive Runes scaling with weapon damage (moxaj) * Fix Crit Chance and base damage for some skills (LocalIdentity) * Fix Infused Spark Cast time (LocalIdentity) * Fix Life Conversion with CI (Blitz54) * Fix Mirage Archer having no Spirit cost (okazakikun) * Fix Liminal Coil counting Marks as Curses (vaisest) --- Fixed Behaviours --- * Fix level requirements on staves, wands, and jewellery and unique items (Blitz54) * Fix Heavy Stunned enemies not counting as Stunned (moxaj) * Fix amulet auras having a Spirit cost (jokker23) * Fix "Shapeshifted" condition being toggled on every build. (briansonnenberg) * Fix gem group counting logic (moxaj) * Fix Rathpith magnitude of Ailments per 100 Life not scaling Ailments properly (vaisest) * Fix Normal and Magic Ward bases not importing (LocalIdentity) --- Accuracy Improvements --- * Fix parsing Vaal Unique modifiers on items (vaisest) * Remove `Are you fortified?` config option (moxaj) * Add new variant for Controlled Metamorphosis (moxaj)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sync fork
devwithupstream/dev.Upstream commits merged
99bc6e107Release 0.23.0 (Release 0.23.0 PathOfBuildingCommunity/PathOfBuilding-PoE2#2395)4605572c9[pob1-port] Update Item import API to support 3.29 changes ([pob1-port] Update Item import API to support 3.29 changes PathOfBuildingCommunity/PathOfBuilding-PoE2#2392)Files changed by the merge (4):
CHANGELOG.md,changelog.txt,manifest.xml,src/Classes/ImportTab.lua. Clean merge, no conflicts.macOS port status: nothing needed forward-porting
The fork's only PoB-side macOS patch is the
jit.os == "OSX"→jit.off()block insrc/Launch.lua(from537ed35df+cf0afdd3b). Upstream did not touch that file.Verification performed:
git diff --name-status <pre-merge dev> HEADlists only the 4 upstream files —src/Launch.luadoes not appear, so no fork patch was silently dropped.git ls-treeforsrc/Launch.luais byte-identical before and after the merge, mode included (100644 2f9b4803f2ca2e315c8a539ccba1a5ac7e417579).git diff upstream/dev HEAD -- src/Launch.luais exactly the 7-linejit.off()block and nothing else.vcpkg-ports/tree orvcpkg-configuration.json, and the merge added no files (all 4 paths are modifications).manifest.xmlreview: the only upstream-touched file that could affect the macOS port, since dev mode is detected bymanifest.xmllacking branch/platform attributes. The change is a0.22.0→0.23.0version bump plus regeneratedsha1entries; no branch/platform attributes were added, so dev-mode detection is unaffected.Tests
bustedandluajitare not onPATHin this environment, so the local suite was not run. CI is the gate —run_testsandcheck_modcachecoversrc/Classes/ImportTab.lua, the only logic file in this merge.Companion repo
PathOfBuilding-SimpleGraphicwas checked in the same run and is already up to date with its upstream (0 commits behind), so its 20 fork-only macOS commits and the staged macOS runtime are untouched. No runtime rebuild was required.